From 9e0883cae65aed8c737d9f67e0cdc98e765ae586 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 23 Jun 2009 11:11:46 +0100 Subject: [PATCH] x86: Another assign_irq_vector() cleanup. Signed-off-by: Yunhong Jiang --- xen/arch/x86/irq.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 42e2b9d0ea..b0591c1827 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -84,15 +84,9 @@ int assign_irq_vector(int irq) spin_lock(&vector_lock); - if ((irq != AUTO_ASSIGN_IRQ) && !IO_APIC_IRQ(irq)) - { - spin_unlock(&vector_lock); - return LEGACY_VECTOR(irq); - } - - if ((irq != AUTO_ASSIGN_IRQ) && (IO_APIC_VECTOR(irq) > 0)) { + if ((irq != AUTO_ASSIGN_IRQ) && (irq_to_vector(irq) > 0)) { spin_unlock(&vector_lock); - return IO_APIC_VECTOR(irq); + return irq_to_vector(irq); } vector = current_vector; -- 2.30.2